Iain sent me a xpm that didn't load. It used "g" instead of "c" in it's

Iain sent me a xpm that didn't load.  It used "g" instead of "c" in it's
color table.

I thought that was borked until I saw Imlib, xv, and Gimp load it up w/o
problem...

So, fixed that (less than one line fix).  HOWEVER, if this is correct,
then the gdk XPM loader in gtk+ also has the same problem.

Owen, got an opinion on this?

Mark

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 04e4aaad68ab0b24e15c78be8b19774d158080fc..a19b927dfa820c4269524eb1516820824ea2c1e9 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-14  Mark Crichton  <crichton@gimp.org>
+
+       * gdk-pixbuf/io-xpm.c (xpm_extract_color): Added check for "g" color type.
+       Imlib/libXpm handle this, but we didn't.
+
 2000-02-14  Darin Adler  <darin@eazel.com>
 
        * gdk-pixbuf/testpixbuf.c: Remove now-unnecessary cast.

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 69a3a4e79e220bd426aaa621fd281fed6fbf9b12..dcc4a8c30a264f16f0ea5af54ebf18f5fce9cfd9 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -195,7 +195,7 @@ xpm_extract_color (const gchar *buffer)
 
        counter = 0;
        while (ptr == NULL) {
-               if (buffer[counter] == 'c') {
+               if ((buffer[counter] == 'c') || (buffer[counter] == 'g')) {
                        ch = buffer[counter + 1];
                        if (ch == 0x20 || ch == 0x09)
                                ptr = &buffer[counter + 1];